Don't produce a stuck drag if shift is held. (#341734, Sebastien Bacher)

2006-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcalendar.c (gtk_calendar_drag_motion): Don't produce
	a stuck drag if shift is held.  (#341734, Sebastien Bacher)

diff --git a/ChangeLog b/ChangeLog
index 1c22de2cb6b810fd98319df345c559b0cbe86380..f40a6d9fbcb0142fb239c67ad28d2c747d7d0d88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcalendar.c (gtk_calendar_drag_motion): Don't produce
+       a stuck drag if shift is held.  (#341734, Sebastien Bacher) 
+
        * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): 
        Always set protocol.  (#342003, Tommi Komulainen)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1c22de2cb6b810fd98319df345c559b0cbe86380..f40a6d9fbcb0142fb239c67ad28d2c747d7d0d88 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcalendar.c (gtk_calendar_drag_motion): Don't produce
+       a stuck drag if shift is held.  (#341734, Sebastien Bacher) 
+
        * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): 
        Always set protocol.  (#342003, Tommi Komulainen)
 

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 724697fe24b71341a20e99ff402a050456189f81..90141d575590e162ccce0786bec1e682e6a912d5 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -3014,7 +3014,7 @@ gtk_calendar_drag_motion (GtkWidget      *widget,
     }
   
   target = gtk_drag_dest_find_target (widget, context, NULL);
-  if (target == GDK_NONE)
+  if (target == GDK_NONE || context->suggested_action == 0)
     gdk_drag_status (context, 0, time);
   else
     {